windows build fixes

diff --git a/Utility/FileIO.hs b/Utility/FileIO.hs
index 99ea53882349a9622342c58f3c989aeddf99d432..3624f940d294cd8bdd5df81c1c033c8aead490f5 100644 (file)
--- a/Utility/FileIO.hs
+++ b/Utility/FileIO.hs
@@ -55,6 +55,7 @@ import Prelude (String, return)
 import qualified Utility.FileIO.CloseOnExec as O
 import qualified Utility.FileIO.String as O
 import qualified Data.ByteString as B
+import qualified Data.ByteString.Lazy as L
 import Control.Applicative
 
 withFile :: OsPath -> IOMode -> (Handle -> IO r) -> IO r 
@@ -118,17 +119,17 @@ openTempFile p s = do
 readFileString :: OsPath -> IO String
 readFileString p = do
        p' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath p)
-       I.readFileString p'
+       O.readFileString p'
 
 writeFileString :: OsPath -> String -> IO ()
 writeFileString f txt = do
        f' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath f)
-       I.writeFileString f' txt
+       O.writeFileString f' txt
 
 appendFileString :: OsPath -> String -> IO ()
 appendFileString f txt = do
        f' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath f)
-       I.appendFileString f' txt
+       O.appendFileString f' txt
 #endif
 
 #else

diff --git a/Utility/Shell.hs b/Utility/Shell.hs
index 5f9b08909d1391b8b4f62d789163c42fac542f8e..5d2c0191ec976fceba6370ce87097ae348414eaa 100644 (file)
--- a/Utility/Shell.hs
+++ b/Utility/Shell.hs
@@ -19,6 +19,7 @@ import Utility.SafeCommand
 import Utility.Path
 import Utility.Exception
 import Utility.PartialPrelude
+import Utility.FileIO (readFileString)
 #endif
 
 shellPath :: FilePath